Merge pull request #324 from soby-mathew/sm/sys_suspend

author danh-arm <[email protected]>

Thu, 2 Jul 2015 15:17:11 +0000 (16:17 +0100)

committer danh-arm <[email protected]>

Thu, 2 Jul 2015 15:17:11 +0000 (16:17 +0100)
author danh-arm <[email protected]>
Thu, 2 Jul 2015 15:17:11 +0000 (16:17 +0100)
committer danh-arm <[email protected]>
Thu, 2 Jul 2015 15:17:11 +0000 (16:17 +0100)
diff --cc docs/firmware-design.md
Simple merge
diff --cc docs/porting-guide.md
Simple merge
diff --cc services/std_svc/psci/psci_common.c
Simple merge
author	danh-arm <[email protected]>
	Thu, 2 Jul 2015 15:17:11 +0000 (16:17 +0100)
committer	danh-arm <[email protected]>
	Thu, 2 Jul 2015 15:17:11 +0000 (16:17 +0100)
		1	2
docs/firmware-design.md	patch \|	diff1 \|	diff2 \|	blob \| history
docs/porting-guide.md	patch \|	diff1 \|	diff2 \|	blob \| history
services/std_svc/psci/psci_common.c	patch \|	diff1 \|	diff2 \|	blob \| history